Skip to content

Fix wording error and add null check#53560

Merged
gastaldi merged 2 commits intoquarkusio:mainfrom
holly-cummins:fix-words-and-add-null-check
Apr 13, 2026
Merged

Fix wording error and add null check#53560
gastaldi merged 2 commits intoquarkusio:mainfrom
holly-cummins:fix-words-and-add-null-check

Conversation

@holly-cummins
Copy link
Copy Markdown
Contributor

@holly-cummins holly-cummins commented Apr 13, 2026

See #53538 (comment).

This rather trivial PR brings main into line with 3.27. I'd be shocked if the null check is ever needed, but there's no harm in being cautious.

gastaldi
gastaldi reviewed Apr 13, 2026
View reviewed changes
Comment thread ...-framework/junit/src/main/java/io/quarkus/test/junit/launcher/CustomLauncherInterceptor.java
.equals(DESIRED_CLASS_ORDERER.getName())
|| orderer.get().equals(CONFIG_SETTING_DESIRED_CLASS_ORDERER.getName()))) {
if (facadeLoader.hasMultipleClassLoaders()) {
if (facadeLoader != null && facadeLoader.hasMultipleClassLoaders()) {
Copy link
Copy Markdown
Member

@gastaldi gastaldi Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The facadeLoader is also accessed in line 127, should we move this null check to there instead?

Copy link
Copy Markdown
Contributor Author

@holly-cummins holly-cummins Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, good question. With the caveat that a null FCL should never happen, thinking about the logic here, just moving the check up and bypassing the whole block if the FCL is null isn't right. For the resetting of the TCCL, we can safely skip if the FCL is null, because that implies the TCCL has already been reset.

For the orderer check, without an FCL, we can't properly check if the orderer override would cause problems. But it's an edge case of an edge case of an edge case.

I'll add an extra guard on the first usage of FCL, so that the subsequent guard doesn't look stupid. But I think I won't wrap everything in the guard, even though it's functionally equivalent, because it's semantically wrong.

@quarkus-bot
Copy link
Copy Markdown

quarkus-bot bot commented Apr 13, 2026 •
edited by github-actions bot
Loading

Status for workflow Quarkus CI

This is the status report for running Quarkus CI on commit 857e00c.

✅ The latest workflow run for the pull request has completed successfully.

It should be safe to merge provided you have a look at the other checks in the summary.

You can consult the Develocity build scans.

Flaky tests - Develocity

⚙️ JVM Tests - JDK 21

📦 extensions/smallrye-reactive-messaging-kafka/deployment

❌ io.quarkus.smallrye.reactivemessaging.kafka.deployment.testing.KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.testContinuousTestingScenario3 - History

  • org.testcontainers.containers.ContainerLaunchException: Container startup failed for image docker.io/library/redis:7 - java.util.concurrent.CompletionException
Details 
java.util.concurrent.CompletionException: org.testcontainers.containers.ContainerLaunchException: Container startup failed for image docker.io/library/redis:7
	at java.base/java.util.concurrent.CompletableFuture.encodeThrowable(CompletableFuture.java:315)
	at java.base/java.util.concurrent.CompletableFuture.completeThrowable(CompletableFuture.java:320)
	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.run(CompletableFuture.java:1807)
	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.exec(CompletableFuture.java:1796)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1312)
	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1843)

⚙️ JVM Tests - JDK 25

📦 extensions/opentelemetry/deployment

❌ io.quarkus.opentelemetry.deployment.OpenTelemetryMDCTest.vertxAsync - History

  • Failing map: {spanId=6584fcd77d36dc3f, traceId=0d98703b9fa6ca3747aa120f7f1ea276, sampled=true, parentId=3df511ea539ecdb9} - java.lang.AssertionError
Details 
java.lang.AssertionError: Failing map: {spanId=6584fcd77d36dc3f, traceId=0d98703b9fa6ca3747aa120f7f1ea276, sampled=true, parentId=3df511ea539ecdb9}
	at io.quarkus.opentelemetry.deployment.OpenTelemetryMDCTest.lambda$vertxAsync$2(OpenTelemetryMDCTest.java:150)
	at java.base/java.util.AbstractList$RandomAccessSpliterator.forEachRemaining(AbstractList.java:722)
	at java.base/java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:803)
	at io.quarkus.opentelemetry.deployment.OpenTelemetryMDCTest.vertxAsync(OpenTelemetryMDCTest.java:146)

⚙️ JVM Integration Tests - JDK 25

📦 integration-tests/reactive-messaging-kafka

❌ io.quarkus.it.kafka.KafkaConnectorTest.testDataForKeyed - History

  • Assertion condition defined as a Lambda expression in io.quarkus.it.kafka.KafkaConnectorTest expected: <3> but was: <4> within 10 seconds. - org.awaitility.core.ConditionTimeoutException
Details 
org.awaitility.core.ConditionTimeoutException: Assertion condition defined as a Lambda expression in io.quarkus.it.kafka.KafkaConnectorTest expected: <3> but was: <4> within 10 seconds.
	at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
	at org.awaitility.core.AssertionCondition.await(AssertionCondition.java:119)
	at org.awaitility.core.AssertionCondition.await(AssertionCondition.java:31)
	at org.awaitility.core.ConditionFactory.until(ConditionFactory.java:1160)
	at org.awaitility.core.ConditionFactory.untilAsserted(ConditionFactory.java:790)
	at io.quarkus.it.kafka.KafkaConnectorTest.testDataForKeyed(KafkaConnectorTest.java:96)
Caused by: org.opentest4j.AssertionFailedError: expected: <3> but was: <4>
  • Assertion condition defined as a Lambda expression in io.quarkus.it.kafka.KafkaConnectorTest expected: <3> but was: <6> within 10 seconds. - org.awaitility.core.ConditionTimeoutException
Details 
org.awaitility.core.ConditionTimeoutException: Assertion condition defined as a Lambda expression in io.quarkus.it.kafka.KafkaConnectorTest expected: <3> but was: <6> within 10 seconds.
	at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
	at org.awaitility.core.AssertionCondition.await(AssertionCondition.java:119)
	at org.awaitility.core.AssertionCondition.await(AssertionCondition.java:31)
	at org.awaitility.core.ConditionFactory.until(ConditionFactory.java:1160)
	at org.awaitility.core.ConditionFactory.untilAsserted(ConditionFactory.java:790)
	at io.quarkus.it.kafka.KafkaConnectorTest.testDataForKeyed(KafkaConnectorTest.java:96)
	Suppressed: java.lang.ClassCastException: class java.util.LinkedHashMap cannot be cast to class io.quarkus.it.kafka.KafkaReceivers$PeopleState (java.util.LinkedHashMap is in module java.base of loader 'bootstrap'; io.quarkus.it.kafka.KafkaReceivers$PeopleState is in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusCla...

@gastaldi gastaldi merged commit 5e338cc into quarkusio:main Apr 13, 2026
66 checks passed
@quarkus-bot quarkus-bot bot added this to the 3.35 - main milestone Apr 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gastaldi gastaldi gastaldi approved these changes

Assignees

No one assigned

Labels

area/testing triage/flaky-test

Projects

None yet

Milestone

3.35.0.CR1

Development

Successfully merging this pull request may close these issues.

2 participants

@holly-cummins @gastaldi